Avoid segfault on xkbless systems
authorMatthias Clasen <mclasen@redhat.com>
Tue, 7 Sep 2010 04:10:26 +0000 (00:10 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 7 Sep 2010 04:10:26 +0000 (00:10 -0400)
This was reported in bug 628932 to cause problems on VNC.

gdk/x11/gdkkeys-x11.c

index c7963f5d818c80b7199f93da7b3c7bfb2d996d4b..827f87dec71387cad75891f5a2708e6a2bdbd1ad 100644 (file)
@@ -1822,7 +1822,9 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 
   keymap = GET_EFFECTIVE_KEYMAP (keymap);
   keymap_x11 = GDK_KEYMAP_X11 (keymap);
-  get_xkb (keymap_x11);
+
+  if (KEYMAP_USE_XKB (keymap))
+    get_xkb (keymap_x11);
 
   retval = TRUE;